auto merge of #907 : alexcrichton/cargo/update-curl, r=alexcrichton

author bors <bors@rust-lang.org>

Wed, 19 Nov 2014 07:12:26 +0000 (07:12 +0000)

committer bors <bors@rust-lang.org>

Wed, 19 Nov 2014 07:12:26 +0000 (07:12 +0000)
author bors <bors@rust-lang.org>
Wed, 19 Nov 2014 07:12:26 +0000 (07:12 +0000)
committer bors <bors@rust-lang.org>
Wed, 19 Nov 2014 07:12:26 +0000 (07:12 +0000)
diff --cc src/cargo/ops/registry.rs
Simple merge
diff --cc tests/test_cargo_package.rs
Simple merge
diff --cc tests/test_cargo_publish.rs
Simple merge
author	bors <bors@rust-lang.org>
	Wed, 19 Nov 2014 07:12:26 +0000 (07:12 +0000)
committer	bors <bors@rust-lang.org>
	Wed, 19 Nov 2014 07:12:26 +0000 (07:12 +0000)
		1	2
src/cargo/ops/registry.rs	patch \|	diff1 \|	diff2 \|	blob \| history
tests/test_cargo_package.rs	patch \|	diff1 \|	diff2 \|	blob \| history
tests/test_cargo_publish.rs	patch \|	diff1 \|	diff2 \|	blob \| history